Skip to content

Conversation

@josenavas
Copy link
Contributor

Built on top of #1207

This PR adds the ability to upload a QIIME mapping file trough the interface. When uploading a QIIME mapping file, a SampleTemplate and a PrepTemplate is created.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling 9db35a5 on josenavas:1084-qiime-map into * on biocore:fix-1084*.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.05%) to 78.69% when pulling f774597 on josenavas:1084-qiime-map into 42326b0 on biocore:fix-1084.

@antgonza
Copy link
Member

Works fine. Except that the validation doesn't accept comments (lines that start with #). Also, I know is not part of this issue but it will be great if you could fix the warnings when adding a template. The issue is that if you have warnings about EBI, processing, etc all of them are in a single line, could you put them in different ones (add </br>)? Gonna take a look a the code.

@josenavas josenavas mentioned this pull request May 29, 2015
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should you also check for LinkerPrimer, BarcodeSequence, and ReverseBarcodeSequence (optional)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a quick and fast check to see if the file is a mapping file. Note that templates do not have any # sign at the beginning, not even for comments. The fact that the file starts with '#SampleID' is enough to know that we are not parsing a template, but a mapping file.

@antgonza
Copy link
Member

Code looks fine, only one comment. However, not sure if we should have a qiime map loading reimplementation here or use qiime. I think having it here could help us deprecate the other one for qiime 2.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment is outdated.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like I end up removing two lines that I shouldn't. I've re-added the lines that define the message and message level in case of success.

@ElDeveloper
Copy link
Contributor

Code looks great, I'm gonna test the system now.

@biocore/qiita-admin would be good if others could test this.

@ElDeveloper
Copy link
Contributor

As for having two parsers, I almost want to re-use the code in QIIME,
having multiple parsers for the same file-format is a nightmare and
prone to error. What do you guys think, I know there's the whole GPL
limitation, etc ... but then again, I think we should think this
through.

On (May-29-15| 9:38), Antonio Gonzalez wrote:

Code looks fine, only one comment. However, not sure if we should have a qiime map loading reimplementation here or use qiime. I think having it here could help us deprecate the other one for qiime 2.


Reply to this email directly or view it on GitHub:
#1219 (comment)

@josenavas
Copy link
Contributor Author

do you want to have a call about the 2 parsers thing? I think it will be faster than discussing over here.

@ElDeveloper
Copy link
Contributor

Sure, anyone else who would like to join?

On (May-29-15|10:00), josenavas wrote:

do you want to have a call about the 2 parsers thing? I think it will be faster than discussing over here.


Reply to this email directly or view it on GitHub:
#1219 (comment)

@josenavas
Copy link
Contributor Author

@ElDeveloper @antgonza this should be ready to review!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the escalation from "looks like" to "is" 😆

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hahaha, yeah it was way shorter....

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add this exception to this try/except.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@ElDeveloper
Copy link
Contributor

PS - You also have some PEP8 failures:

qiita_db/metadata_template/util.py:400:13: E731 do not assign a lambda expression, use a def
qiita_db/metadata_template/util.py:403:13: E731 do not assign a lambda expression, use a def
qiita_db/metadata_template/util.py:407:13: E731 do not assign a lambda expression, use a def
qiita_db/metadata_template/util.py:410:13: E731 do not assign a lambda expression, use a def

@josenavas
Copy link
Contributor Author

Thanks @ElDeveloper . I don't understand why the flake8 in travis is different from the one on my machine... I think the one in conda has something different.

@ElDeveloper
Copy link
Contributor

Thanks @josenavas. Yeah, conda is sometimes a bit outdated compared to the pypi packages ...

@ElDeveloper
Copy link
Contributor

I hereby officially declare this as 👍! If someone else wants to go ahead and merge, that would be awesome.

@antgonza
Copy link
Member

In nomine Patris, et Filii, et Spiritus Sancti. Amen

antgonza added a commit that referenced this pull request May 30, 2015
@antgonza antgonza merged commit 3ac6ab9 into qiita-spots:fix-1084 May 30, 2015
@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 78.65% when pulling 8b6a73e on josenavas:1084-qiime-map into 42326b0 on biocore:fix-1084.

@ElDeveloper
Copy link
Contributor

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants